OTA-1967: install: Drop Lightspeed CustomResourceDefinitions (Proposal, etc.)#1412
OTA-1967: install: Drop Lightspeed CustomResourceDefinitions (Proposal, etc.)#1412wking wants to merge 2 commits into
Conversation
These are now conveniently installed in test clusters via [1], so we can demo tech-preview Proposal creation with the agentic Lightspeed operator installed, without having to install the CRDs ourselves. Reverts 4936d65 (OTA-1965: Add Lightspeed CustomResourceDefinitions, 2026-04-21, openshift#1380). This adjusts the approach 8520979 (OTA-1967: Take official CRDs from the OpenShift Lightspeed operator, 2026-05-08, openshift#1380) had taken, by pushing CRD handling over to Lightspeed, instead of leaving the CVO on the hook to deploy Lightspeed's CRDs for them, now that the Lightspeed quickstart makes Lightspeed-manages-its-own-CRDs so easy. [1]: https://github.com/openshift/lightspeed-agentic-operator/tree/main/hack/quickstart
|
@wking: This pull request references OTA-1967 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (4)
💤 Files with no reviewable changes (1)
🚧 Files skipped from review as they are similar to previous changes (2)
WalkthroughThree LightSpeed CRD manifests were deleted, and the related proposal test path now skips CRD-dependent checks when the API is unavailable. ChangesLightSpeed CRD removal and test updates
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 13 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (13 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
5c14a83 to
5687c39
Compare
|
We have |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jhadvig, wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold This PR removes the Lightspeed CRDs (Proposal, etc.) from CVO's install manifests, but the e2e test still expects them to be installed. The test needs to be updated or removed alongside the CRD removal. |
|
Summary: 6 of 8 failures are Azure install flakes. The 1 real failure is the Lightspeed CRDs e2e test that contradicts the PR's intent... the test asserts CRDs exist, but this PR deliberately removes them. /retest |
With 5687c39 (install: Drop Lightspeed CustomResourceDefinitions (Proposal, etc.), 2026-06-24, openshift#1412) dropping our handling of those CRDs, we need to adjust the test harness to: * Stop asserting the CRDs are installed (that's no longer our job) and... * Make our Proposal-handling testing conditional on someone else (e.g. a step in a CI job's configuration) having installed the Proposal CRD. Avoids [1]: : [Jira:"Cluster Version Operator"] cluster-version-operator should install light speed CRDs correctly expand_less 0s { fail [github.com/openshift/cluster-version-operator/test/cvo/proposal.go:95]: Expected <*errors.StatusError | 0xc000910c80>: customresourcedefinitions.apiextensions.k8s.io "proposals.agentic.openshift.io" not found [1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1412/pull-ci-openshift-cluster-version-operator-main-e2e-aws-ovn-techpreview/2069909194613460992
|
New changes are detected. LGTM label has been removed. |
Good point; we were. I've pushed ed4e43c to address that (skipping the Proposal-handling testing if the CRD isn't installed. We should probably be setting up some kind of "serial with OLS installed" test-case for this repo, but I'm deferring that to OTA-1947. |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@test/util/util.go`:
- Around line 153-164: Fix SkipIfNoAPI so it compiles and matches its callers:
in util.SkipIfNoAPI, use the passed restConfig when creating the apiextensions
client, declare err locally before checking it, and keep the CRD lookup/Skipf
logic unchanged. Also align the helper name with the call site in proposal.go by
either renaming SkipIfNoAPI to SkipIfNoProposalAPI or updating the caller to use
SkipIfNoAPI, and correct the doc comment typo in SkipIfNoAPI.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: ca5b74ad-b34a-4e31-b996-a79c8eb39f2d
📒 Files selected for processing (3)
.openshift-tests-extension/openshift_payload_cluster-version-operator.jsontest/cvo/proposal.gotest/util/util.go
💤 Files with no reviewable changes (1)
- .openshift-tests-extension/openshift_payload_cluster-version-operator.json
With 5687c39 (install: Drop Lightspeed CustomResourceDefinitions (Proposal, etc.), 2026-06-24, openshift#1412) dropping our handling of those CRDs, we need to adjust the test harness to: * Stop asserting the CRDs are installed (that's no longer our job) and... * Make our Proposal-handling testing conditional on someone else (e.g. a step in a CI job's configuration) having installed the Proposal CRD. Avoids [1]: : [Jira:"Cluster Version Operator"] cluster-version-operator should install light speed CRDs correctly expand_less 0s { fail [github.com/openshift/cluster-version-operator/test/cvo/proposal.go:95]: Expected <*errors.StatusError | 0xc000910c80>: customresourcedefinitions.apiextensions.k8s.io "proposals.agentic.openshift.io" not found [1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1412/pull-ci-openshift-cluster-version-operator-main-e2e-aws-ovn-techpreview/2069909194613460992
ed4e43c to
79c2211
Compare
With 5687c39 (install: Drop Lightspeed CustomResourceDefinitions (Proposal, etc.), 2026-06-24, openshift#1412) dropping our handling of those CRDs, we need to adjust the test harness to: * Stop asserting the CRDs are installed (that's no longer our job) and... * Make our Proposal-handling testing conditional on someone else (e.g. a step in a CI job's configuration) having installed the Proposal CRD. Avoids [1]: : [Jira:"Cluster Version Operator"] cluster-version-operator should install light speed CRDs correctly expand_less 0s { fail [github.com/openshift/cluster-version-operator/test/cvo/proposal.go:95]: Expected <*errors.StatusError | 0xc000910c80>: customresourcedefinitions.apiextensions.k8s.io "proposals.agentic.openshift.io" not found [1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1412/pull-ci-openshift-cluster-version-operator-main-e2e-aws-ovn-techpreview/2069909194613460992
79c2211 to
59db086
Compare
With 5687c39 (install: Drop Lightspeed CustomResourceDefinitions (Proposal, etc.), 2026-06-24, openshift#1412) dropping our handling of those CRDs, we need to adjust the test harness to: * Stop asserting the CRDs are installed (that's no longer our job) and... * Make our Proposal-handling testing conditional on someone else (e.g. a step in a CI job's configuration) having installed the Proposal CRD. Avoids [1]: : [Jira:"Cluster Version Operator"] cluster-version-operator should install light speed CRDs correctly expand_less 0s { fail [github.com/openshift/cluster-version-operator/test/cvo/proposal.go:95]: Expected <*errors.StatusError | 0xc000910c80>: customresourcedefinitions.apiextensions.k8s.io "proposals.agentic.openshift.io" not found [1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1412/pull-ci-openshift-cluster-version-operator-main-e2e-aws-ovn-techpreview/2069909194613460992
59db086 to
c069f8e
Compare
|
@wking: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
These are now conveniently installed in test clusters via a quickstart script, so we can demo tech-preview Proposal creation with the agentic Lightspeed operator installed, without having to install the CRDs ourselves. Reverts 4936d65 (#1380). This adjusts the approach that 8520979 (#1387) had taken, by pushing CRD handling over to Lightspeed, instead of leaving the CVO on the hook to deploy Lightspeed's CRDs for them, now that the Lightspeed quickstart makes Lightspeed-manages-its-own-CRDs so easy.
Summary by CodeRabbit
Breaking Changes
Tests
Chores